Autogenerated HTML docs for v1.7.3.2-161-g3089c
diff --git a/git-mergetool.html b/git-mergetool.html index f93e087..8081cc8 100644 --- a/git-mergetool.html +++ b/git-mergetool.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-mergetool(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-mergetool(1)</title> </head> <body> <div id="header"> @@ -318,26 +412,26 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git mergetool</em> [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>…]</p></div> +<div class="paragraph"><p><em>git mergetool</em> [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>…]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Use <tt>git mergetool</tt> to run one of several merge utilities to resolve +<div class="paragraph"><p>Use <tt>git mergetool</tt> to run one of several merge utilities to resolve merge conflicts. It is typically run after <em>git merge</em>.</p></div> -<div class="para"><p>If one or more <file> parameters are given, the merge tool program will +<div class="paragraph"><p>If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file. If no <file> names are specified, <em>git mergetool</em> will run the merge tool program on every file with merge conflicts.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -t <tool> </dt> -<dt> +<dt class="hdlist1"> --tool=<tool> </dt> <dd> @@ -347,20 +441,20 @@ kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, diffuse, tortoisemerge, opendiff, p4merge and araxis. </p> -<div class="para"><p>If a merge resolution program is not specified, <em>git mergetool</em> +<div class="paragraph"><p>If a merge resolution program is not specified, <em>git mergetool</em> will use the configuration variable <tt>merge.tool</tt>. If the configuration variable <tt>merge.tool</tt> is not set, <em>git mergetool</em> will pick a suitable default.</p></div> -<div class="para"><p>You can explicitly provide a full path to the tool by setting the +<div class="paragraph"><p>You can explicitly provide a full path to the tool by setting the configuration variable <tt>mergetool.<tool>.path</tt>. For example, you can configure the absolute path to kdiff3 by setting <tt>mergetool.kdiff3.path</tt>. Otherwise, <em>git mergetool</em> assumes the tool is available in PATH.</p></div> -<div class="para"><p>Instead of running one of the known merge tool programs, +<div class="paragraph"><p>Instead of running one of the known merge tool programs, <em>git mergetool</em> can be customized to run an alternative program by specifying the command line to invoke in a configuration variable <tt>mergetool.<tool>.cmd</tt>.</p></div> -<div class="para"><p>When <em>git mergetool</em> is invoked with this tool (either through the +<div class="paragraph"><p>When <em>git mergetool</em> is invoked with this tool (either through the <tt>-t</tt> or <tt>--tool</tt> option or the <tt>merge.tool</tt> configuration variable) the configured command line will be invoked with <tt>$BASE</tt> set to the name of a temporary file containing the common base for @@ -370,25 +464,25 @@ contents of the file to be merged, and <tt>$MERGED</tt> set to the name of the file to which the merge tool should write the result of the merge resolution.</p></div> -<div class="para"><p>If the custom merge tool correctly indicates the success of a +<div class="paragraph"><p>If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable <tt>mergetool.<tool>.trustExitCode</tt> can be set to <tt>true</tt>. Otherwise, <em>git mergetool</em> will prompt the user to indicate the success of the resolution after the custom tool has exited.</p></div> </dd> -<dt> +<dt class="hdlist1"> -y </dt> -<dt> +<dt class="hdlist1"> --no-prompt </dt> <dd> <p> - Don't prompt before each invocation of the merge resolution + Don’t prompt before each invocation of the merge resolution program. </p> </dd> -<dt> +<dt class="hdlist1"> --prompt </dt> <dd> @@ -402,28 +496,28 @@ </div> <h2 id="_temporary_files">TEMPORARY FILES</h2> <div class="sectionbody"> -<div class="para"><p><tt>git mergetool</tt> creates <tt>*.orig</tt> backup files while resolving merges. +<div class="paragraph"><p><tt>git mergetool</tt> creates <tt>*.orig</tt> backup files while resolving merges. These are safe to remove once a file has been merged and its <tt>git mergetool</tt> session has completed.</p></div> -<div class="para"><p>Setting the <tt>mergetool.keepBackup</tt> configuration variable to <tt>false</tt> +<div class="paragraph"><p>Setting the <tt>mergetool.keepBackup</tt> configuration variable to <tt>false</tt> causes <tt>git mergetool</tt> to automatically remove the backup as files are successfully merged.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Theodore Y Ts'o <tytso@mit.edu></p></div> +<div class="paragraph"><p>Written by Theodore Y Ts’o <<a href="mailto:tytso@mit.edu">tytso@mit.edu</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Theodore Y Ts'o.</p></div> +<div class="paragraph"><p>Documentation by Theodore Y Ts’o.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-10-22 04:11:08 UTC +Last updated 2010-11-06 00:41:57 UTC </div> </div> </body> 